From: Matthias Clasen <mclasen@redhat.com>
Date: Fri, 31 Jul 2015 17:45:17 +0000 (-0400)
Subject: gesture single: Use gtk_simulate_touchscreen
X-Git-Tag: archive/raspbian/3.24.39-1+rpi1~1^2~65^2~39^2~6008
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success/%22http:/www.example.com/cgi/success?a=commitdiff_plain;h=28b4599f9b9907a1de49f83539e7f56f603fa892;p=gtk%2B3.0.git

gesture single: Use gtk_simulate_touchscreen

Instead of manual tests.
---

diff --git a/gtk/gtkgesturesingle.c b/gtk/gtkgesturesingle.c
index 5b595c508e..178e878cd2 100644
--- a/gtk/gtkgesturesingle.c
+++ b/gtk/gtkgesturesingle.c
@@ -147,8 +147,7 @@ gtk_gesture_single_handle_event (GtkEventController *controller,
   source = gdk_device_get_source (source_device);
 
   if (source != GDK_SOURCE_TOUCHSCREEN)
-    test_touchscreen = ((gtk_get_debug_flags () & GTK_DEBUG_TOUCHSCREEN) != 0 ||
-                        g_getenv ("GTK_TEST_TOUCHSCREEN"));
+    test_touchscreen = gtk_simulate_touchscreen ();
 
   switch (event->type)
     {
@@ -305,8 +304,7 @@ _gtk_gesture_single_update_evmask (GtkGestureSingle *gesture)
   priv = gtk_gesture_single_get_instance_private (gesture);
   evmask = GDK_TOUCH_MASK;
 
-  if (!priv->touch_only || g_getenv ("GTK_TEST_TOUCHSCREEN") ||
-      (gtk_get_debug_flags () & GTK_DEBUG_TOUCHSCREEN) != 0)
+  if (!priv->touch_only || gtk_simulate_touchscreen ())
     evmask |= GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
       GDK_BUTTON_MOTION_MASK;